[ Patch from Sebastian Wilhelmi, 52790 ]
authorOwen Taylor <otaylor@redhat.com>
Thu, 23 Aug 2001 15:26:49 +0000 (15:26 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Thu, 23 Aug 2001 15:26:49 +0000 (15:26 +0000)
Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>

[ Patch from Sebastian Wilhelmi, 52790 ]

* gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h

* gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h:
Move compatibility macros from g[dt]kcompat.h to within
#ifndef G[DT]K_DISABLE_DEPRECATED in each file.

* gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.

* demos/Makefile.am demos/gtk-demo/Makefile.am
          docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
          tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.

* demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
                 testpixbuf.c}: Fix usages of deprecated functions.

53 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
configure.in
demos/Makefile.am
demos/gtk-demo/Makefile.am
demos/pixbuf-demo.c
demos/testpixbuf-drawable.c
demos/testpixbuf-save.c
demos/testpixbuf-scale.c
demos/testpixbuf.c
docs/reference/gdk-pixbuf/Makefile.am
docs/reference/gtk/gtk-sections.txt
docs/reference/gtk/tmpl/gtk-unused.sgml
docs/reference/gtk/tmpl/gtknotebook.sgml
gdk-pixbuf/gdk-pixbuf-csource.c
gdk/Makefile.am
gdk/gdk.h
gdk/gdkcursor.h
gdk/gdkdrawable.h
gdk/gdkgc.h
gdk/gdkimage.h
gdk/gdkpixmap.h
gdk/gdkrgb.h
gdk/gdkwindow.h
gdk/makefile.msc
gtk/.cvsignore
gtk/Makefile.am
gtk/gtk.h
gtk/gtkaccellabel.h
gtk/gtkcheckmenuitem.h
gtk/gtkcontainer.h
gtk/gtkctree.h
gtk/gtklabel.h
gtk/gtkmain.c
gtk/gtkmenu.h
gtk/gtknotebook.h
gtk/gtkpacker.h
gtk/gtkpaned.h
gtk/gtkrc.c
gtk/gtkscale.h
gtk/gtkstyle.h
gtk/gtktogglebutton.h
gtk/gtktypeutils.h
gtk/gtkwindow.h
gtk/makefile.mingw.in
gtk/makefile.msc.in
modules/input/Makefile.am
tests/Makefile.am

index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 84eb13d4b03fd13b54531034afe1e076e9c42d96..6c164c0ad94e3bedb6ceea9f4438ed539ca4903a 100644 (file)
@@ -1,3 +1,22 @@
+Wed Aug 22 19:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       [ Patch from Sebastian Wilhelmi, 52790 ]
+
+       * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h
+
+       * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: 
+       Move compatibility macros from g[dt]kcompat.h to within 
+       #ifndef G[DT]K_DISABLE_DEPRECATED in each file.
+
+       * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h.
+
+       * demos/Makefile.am demos/gtk-demo/Makefile.am 
+         docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am
+         tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED.
+
+       * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c,
+                testpixbuf.c}: Fix usages of deprecated functions.
+
 Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
index 76dc6fda6d2abba371ffa5b4e693a75ab272e5d3..9a0fc098ad3bd317c4801d9bbcd9f81933e2bd5b 100644 (file)
@@ -1158,7 +1158,7 @@ gdk/linux-fb/Makefile
 gtk/Makefile
 gtk/makefile.mingw
 gtk/makefile.msc
-gtk/gtkcompat.h
+gtk/gtkversion.h
 gtk/gtk-win32.rc
 gtk/stock-icons/Makefile
 modules/Makefile
index 5bcf5023cbb1d7ddd9bf04305db1351b40fad37c..28c0ef6d7c2e08f59a7eefc012b72e46819767de 100644 (file)
@@ -5,7 +5,8 @@ SUBDIRS = gtk-demo
 INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
-       -DGTK_DISABLE_COMPAT_H                          \
+       -DG_DISABLE_DEPRECATED                          \
+       -DGDK_DISABLE_DEPRECATED                        \
        -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
index 64b821d3316fb81f3d852847a3973596f5729d6f..b1dc0205980484e6d0559373b13ab0a857dcccba 100644 (file)
@@ -25,9 +25,7 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
        -DG_DISABLE_DEPRECATED                          \
-       -DGDK_DISABLE_COMPAT_H                          \
        -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_COMPAT_H                          \
        -DGTK_DISABLE_DEPRECATED                        \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
index 722007ac71ede54f008f273a5efb8d1c7a54b607..2ecd6f1d775a481ae8d9052832b8c8a715f4e655 100644 (file)
@@ -202,7 +202,6 @@ main (int argc, char **argv)
 
        pixbuf_init ();
        gtk_init (&argc, &argv);
-       gdk_rgb_init ();
 
        if (!load_pixbufs ()) {
                g_message ("main(): Could not load all the pixbufs!");
index be40573cbebc089a052fbc3001deeb0aa0fa1041..6581d47749b63630e32a21ce0fb90d8c344199ac 100644 (file)
@@ -86,9 +86,8 @@ int main(int argc, char **argv)
 
    gtk_init(&argc, &argv);   
    gdk_rgb_set_verbose(TRUE);
-   gdk_rgb_init();
 
-   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
+   gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
 
    root = GDK_ROOT_PARENT();
    pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
index 071352ace54c30ea747b696f1e706cc802770888..9847d9c17f6fa44a44d1cb7252a58fd4d114333d 100644 (file)
@@ -126,7 +126,7 @@ main (int argc, char **argv)
    
         gtk_init (&argc, &argv);   
 
-        gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
 
         root = GDK_ROOT_PARENT ();
         pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
index d2c318d2b21acaccce8ca5be494ac6b6fa9fb143..fd6c801dca01f71e743e640a15e8373b1b22759d 100644 (file)
@@ -68,7 +68,6 @@ main(int argc, char **argv)
        pixbuf_init ();
 
        gtk_init (&argc, &argv);
-       gdk_rgb_init ();
 
        if (argc != 2) {
                fprintf (stderr, "Usage: testpixbuf-scale FILE\n");
index 707398f8df64ab273493a38698dd2b2781032c1b..a61491fdde22f64d6f9a0f35771bc1f5b7be0548 100644 (file)
@@ -520,9 +520,7 @@ main (int argc, char **argv)
 
        gdk_rgb_set_verbose (TRUE);
 
-       gdk_rgb_init ();
-
-       gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
+       gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
 
        {
                char *tbf_readlen = getenv("TBF_READLEN");
index 5c2dc329f5f5153ebc1ce2dd9a2650a5fabbc70d..39dd8e48581a80154550aa937d4754dda2d41560 100644 (file)
@@ -52,7 +52,6 @@ GTKDOC_CFLAGS = @STRIP_BEGIN@                                 \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)                               \
        -I$(top_builddir)/gdk                           \
-       -DGTK_DISABLE_COMPAT_H                          \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
 @STRIP_END@
index 5d953b45a0fa5ad38c49b7f4d74cf26449ff62a0..2ae6bc7fc137e8938e211bffbf89f62bf846233b 100644 (file)
@@ -3244,22 +3244,6 @@ GTK_MICRO_VERSION
 GTK_BINARY_AGE
 GTK_INTERFACE_AGE
 GTK_CHECK_VERSION
-<SUBSECTION Private>
-GTK_HAVE_CONTAINER_FOCUS_ADJUSTMENTS
-GTK_HAVE_SIGNAL_INIT
-GTK_HAVE_FEATURES_1_1_0
-GTK_HAVE_FEATURES_1_1_2
-GTK_HAVE_FEATURES_1_1_4
-GTK_HAVE_FEATURES_1_1_5
-GTK_HAVE_FEATURES_1_1_6
-GTK_HAVE_FEATURES_1_1_7
-GTK_HAVE_FEATURES_1_1_8
-GTK_HAVE_FEATURES_1_1_9
-GTK_HAVE_FEATURES_1_1_10
-GTK_HAVE_FEATURES_1_1_11
-GTK_HAVE_FEATURES_1_1_12
-GTK_HAVE_FEATURES_1_1_13
-GTK_HAVE_FEATURES_1_1_14
 </SECTION>
 
 
index 3c9c63eebe90700ad0cfb0f3d4ce5735764e259f..ddd6912d4c276d7ad27cb68bd4e3a34a60512180 100644 (file)
@@ -1613,6 +1613,13 @@ Get the type of GtkIdentifier.
 @menu: 
 @Returns: 
 
+<!-- ##### MACRO gtk_notebook_set_page ##### -->
+<para>
+</para>
+
+@notebook: 
+@page_num: 
+
 <!-- ##### FUNCTION gtk_object_arg_get ##### -->
 <para>
 Private function to get an argument and argument info from an object.
index 13ec1fa9f1ad6b64cc65290881315dc1857d3bb0..5ed3d8534c81e185e0ebaabe758e99889344bb90 100644 (file)
@@ -118,7 +118,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
 
 <!-- ##### MACRO gtk_notebook_current_page ##### -->
 <para>
-Compatibility macro; in gtkcompat.h.
+Deprecated compatibility macro.
 </para>
 
 
@@ -132,15 +132,6 @@ Compatibility macro; in gtkcompat.h.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-</para>
-
-<!-- # Unused Parameters # -->
-@notebook: 
-@page_num: 
-
-
 <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
 <para>
 </para>
index e64df4fcb326702a7cd16fe398dc1b11fa733e1a..ea56798b47ae1b1d37f6e26d9e4e6f9719a25cda 100644 (file)
@@ -18,7 +18,7 @@
  */
 #include "config.h"
 
-#include "../gtk/gtkcompat.h"  /* versioning */
+#include "../gtk/gtkversion.h" /* versioning */
 #include "gdk-pixbuf.h"
 #include "gdk-pixdata.h"
 #include <stdio.h>
index 2e2c19b5db7ad09a97d686a61453ec41a1772aae..ecfb04ed9ce6936039da98c231a59774d5e2a83e 100644 (file)
@@ -46,7 +46,6 @@ LDFLAGS = @STRIP_BEGIN@                                       \
 gdk_public_h_sources = @STRIP_BEGIN@ \
        gdk.h           \
        gdkcolor.h      \
-       gdkcompat.h     \
        gdkcursor.h     \
        gdkcursors.h    \
        gdkdnd.h        \
index 7f0f9758ae564383ad65f3aee68564cdf1178fcd..25b17c1db17de54fef6ac7ce233304bb6c62bfa4 100644 (file)
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -49,8 +49,6 @@
 #include <gdk/gdkvisual.h>
 #include <gdk/gdkwindow.h>
 
-#include <gdk/gdkcompat.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
index 3c676f777239f2d12c5ff98ff98817f143ee19af..be2778c3fa956196ff204bf6fc8df5666f85e962 100644 (file)
@@ -39,6 +39,10 @@ GdkCursor* gdk_cursor_new_from_pixmap         (GdkPixmap       *source,
 GdkCursor* gdk_cursor_ref                (GdkCursor      *cursor);
 void       gdk_cursor_unref              (GdkCursor      *cursor);
 
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_cursor_destroy             gdk_cursor_unref
+#endif /* GDK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 47b09adeb40a9075e74404d739cf31484fa6605c..06d79e2452a377032fbe0df7603ced4aaab02cf7 100644 (file)
@@ -274,6 +274,11 @@ void gdk_draw_layout_with_colors      (GdkDrawable     *drawable,
                                        GdkColor        *foreground,
                                        GdkColor        *background);
 
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_draw_pixmap                gdk_draw_drawable
+#define gdk_draw_bitmap                gdk_draw_drawable
+#endif /* GDK_DISABLE_DEPRECATED */
+
 GdkImage* gdk_drawable_get_image (GdkDrawable *drawable,
                                   gint         x,
                                   gint         y,
index e55a41e0eadf8c188d4f1dadb540e760c879c234..997809fc9a6f787f592d35a81a5e98a097d115dc 100644 (file)
@@ -252,6 +252,10 @@ void         gdk_gc_set_rgb_fg_color (GdkGC       *gc,
 void         gdk_gc_set_rgb_bg_color (GdkGC       *gc,
                                      GdkColor    *color);
 
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_gc_destroy                 gdk_gc_unref
+#endif /* GDK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 3812db988a9ddbcb6a1e10b99751161c1802a6a0..81e4679dd617c70458d8f06f53544f4c64f75410 100644 (file)
@@ -95,6 +95,10 @@ GdkImage* gdk_image_new_bitmap (GdkVisual     *visual,
                                gint          height);
 #endif /* GDK_ENABLE_BROKEN */
 
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_image_destroy              gdk_image_unref
+#endif /* GDK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index abb044fd79c2ecc5c4557591babfe0aec20c8370..e02aa634d275374957c1f4c869e36811cf66bcb4 100644 (file)
@@ -73,6 +73,13 @@ GdkPixmap* gdk_pixmap_colormap_create_from_xpm_d (GdkWindow    *window,
                                                  GdkColor     *transparent_color,
                                                  gchar       **data);
 
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_bitmap_ref                 gdk_drawable_ref
+#define gdk_bitmap_unref               gdk_drawable_unref
+#define gdk_pixmap_ref                 gdk_drawable_ref
+#define gdk_pixmap_unref               gdk_drawable_unref
+#endif /* GDK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 5a41b3f63b4818853c8af0fefc93a9d1b57b251a..7b1a1c60ab4955f24f2f9599bd1e3fc327d92012 100644 (file)
@@ -51,6 +51,7 @@ void   gdk_rgb_gc_set_foreground (GdkGC       *gc,
                                  guint32      rgb);
 void   gdk_rgb_gc_set_background (GdkGC       *gc,
                                  guint32      rgb);
+#define gdk_rgb_get_cmap               gdk_rgb_get_colormap
 #endif /* GDK_DISABLE_DEPRECATED */
 
 void   gdk_rgb_find_color        (GdkColormap *colormap,
index 425cfe871dff5c22ee57fa9433a2525298ffcdb1..e6f6bf5a7d78f34efd30fd3c4f180bed307474cd 100644 (file)
@@ -516,6 +516,20 @@ void gdk_window_get_internal_paint_info (GdkWindow    *window,
 
 GdkPointerHooks *gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks);   
 
+
+#ifndef GDK_DISABLE_DEPRECATED
+#define gdk_window_get_size            gdk_drawable_get_size
+#define gdk_window_get_type            gdk_window_get_window_type
+#define gdk_window_get_colormap        gdk_drawable_get_colormap
+#define gdk_window_set_colormap        gdk_drawable_set_colormap
+#define gdk_window_get_visual          gdk_drawable_get_visual
+#define gdk_window_ref                 gdk_drawable_ref
+#define gdk_window_unref               gdk_drawable_unref
+
+#define gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) \
+   gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)
+#endif /* GDK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index dd6c377fc6e411717711817b4be9bb912595f5db..ecfa223377bd111c50315b09380d96504f397e8b 100644 (file)
@@ -85,7 +85,6 @@ gdk_OBJECTS = \
 gdk_public_h_sources = \
        gdk.h           \
        gdkcolor.h      \
-       gdkcompat.h     \
        gdkcursor.h     \
        gdkcursors.h    \
        gdkdnd.h        \
index 3a84e3c07352a357a8e5946a83aa77e29d913053..461b0f27d80ea4e72ed2d992fff0704625c9ff80 100644 (file)
@@ -7,7 +7,7 @@ makefile.msc
 _libs
 .libs
 libgtk-*.la
-gtkcompat.h
+gtkversion.h
 libgtk.la
 gtkfeatures.h
 gtkmarshal.h
index 0ea53da902c8ef8071d1476e161b5b0fc82cb297..b4124e6a64d911b3d609fbb1f1414b3b347f48af 100644 (file)
@@ -4,7 +4,6 @@ SUBDIRS=stock-icons
 
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
-       -DGTK_DISABLE_COMPAT_H                          \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
@@ -388,7 +387,7 @@ gtk_built_sources = @STRIP_BEGIN@ \
 # that don't serve as direct make target sources, i.e. they don't have
 # their own .lo rules and don't get publically installed
 gtk_extra_sources = @STRIP_BEGIN@ \
-       gtkcompat.h.in          \
+       gtkversion.h.in         \
        maketypes.awk           \
        makeenums.h             \
        gtk-boxed.defs          \
@@ -399,7 +398,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \
 #
 # setup GTK+ sources and their dependancies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkcompat.h
+gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
 gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
 MAINTAINERCLEANFILES += $(gtk_built_sources)
 EXTRA_HEADERS +=
index 7f7c072b084768c291cb64c29450cf0967cf763e..2564d775841401e2b8a846ec501288ba22c5f5ae 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -54,7 +54,6 @@
 #include <gtk/gtkcolorsel.h>
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtkcombo.h>
-#include <gtk/gtkcompat.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcurve.h>
 #include <gtk/gtktypeutils.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkvbbox.h>
+#include <gtk/gtkversion.h>
 #include <gtk/gtkviewport.h>
 #include <gtk/gtkvpaned.h>
 #include <gtk/gtkvruler.h>
index 65dc533bda4865ded7097b558a7d00e853f4860f..5a9b779aac59bceef5f1c46adba3fbf35d209be9 100644 (file)
@@ -75,6 +75,9 @@ struct _GtkAccelLabelClass
   guint                 latin1_to_char : 1;
 };
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_accel_label_accelerator_width       gtk_accel_label_get_accel_width
+#endif /* GTK_DISABLE_DEPRECATED */
 
 GtkType           gtk_accel_label_get_type          (void) G_GNUC_CONST;
 GtkWidget *gtk_accel_label_new              (const gchar   *string);
index 3e3fabc9790959d90ffacb9b5c4fe0cb23553eb1..bfa2a090b20acc82d4a491d32a57e9ad096c3454 100644 (file)
@@ -83,6 +83,7 @@ gboolean   gtk_check_menu_item_get_inconsistent  (GtkCheckMenuItem *check_menu_i
 #ifndef GTK_DISABLE_DEPRECATED
 void      gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
                                                gboolean          always);
+#define        gtk_check_menu_item_set_state           gtk_check_menu_item_set_active
 #endif
 
 #ifdef __cplusplus
index 34f0b07f83dbae20a8d7fb40913041a259cf7e8d..a4651c0aa7714727cbddc62a47e03090c64f0a55 100644 (file)
@@ -206,6 +206,10 @@ gchar*     gtk_container_child_composite_name   (GtkContainer *container,
                                              GtkWidget    *child);
 void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_container_border_width              gtk_container_set_border_width
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 5276bf2d898f691766c359abb5e76990b290323a..6763ea9f1efefbf6cae5194250a8c60a2308faff 100644 (file)
@@ -430,6 +430,7 @@ void gtk_ctree_sort_recursive                    (GtkCTree     *ctree,
                                                  GtkCTreeNode *node);
 
 
+#define gtk_ctree_set_reorderable(t,r)                    gtk_clist_set_reorderable((GtkCList*) (t),(r))
 
 #ifdef __cplusplus
 }
index 5ba51e54fe232d85591e11c0cd7fa3b10aa548b9..03524a3b287f70471a0e9aacbf28a3b8e2fd24b3 100644 (file)
@@ -133,12 +133,9 @@ void         gtk_label_get_layout_offsets (GtkLabel *label,
                                            gint     *y);
 
 
-#ifndef        GTK_DISABLE_COMPAT_H
-#  define gtk_label_set                                gtk_label_set_text
-#endif /* GTK_DISABLE_COMPAT_H */
-
 #ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated */
+
+#define  gtk_label_set           gtk_label_set_text
 void       gtk_label_get           (GtkLabel          *label,
                                     char             **str);
 
index 7cbb69974d06a6241161f577a1d3bfbdfcb39d02..c4b40b09515bd6023a9ea5555b2fe1611b16e063 100644 (file)
@@ -40,7 +40,7 @@
 #include <unistd.h>
 #endif
 #include "gtkdnd.h"
-#include "gtkcompat.h"
+#include "gtkversion.h"
 #include "gtkmain.h"
 #include "gtkrc.h"
 #include "gtkselection.h"
index 75f51c2a8ceb67565cd23dc6593a9db9c2523ec9..9acfb410b0d618e5de5c45bccb1395f04e0ac3da 100644 (file)
@@ -178,6 +178,12 @@ void       gtk_menu_reorder_child         (GtkMenu             *menu,
                                            GtkWidget           *child,
                                            gint                position);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define gtk_menu_append                                gtk_menu_shell_append
+#define gtk_menu_prepend                       gtk_menu_shell_prepend
+#define gtk_menu_insert                                gtk_menu_shell_insert
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 651db4534bc42a39ebf013f4377e77180e0732ef..cead604b3b7d2d63056f8ef6e22bb978e33c1315 100644 (file)
@@ -222,6 +222,10 @@ void gtk_notebook_reorder_child           (GtkNotebook *notebook,
                                           GtkWidget   *child,
                                           gint         position);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_notebook_current_page               gtk_notebook_get_current_page
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index bceefef6909e1e0e821138ed2709ab0aeff2d47e..4c30a934d2653639fa5a48a869531f88bcbb73be 100644 (file)
@@ -123,6 +123,7 @@ void       gtk_packer_set_child_packing            (GtkPacker       *packer,
                                                guint            pad_y,
                                                guint            i_pad_x,
                                                guint            i_pad_y);
+#define           gtk_packer_configure                gtk_packer_set_child_packing
 void      gtk_packer_reorder_child            (GtkPacker       *packer,
                                                GtkWidget       *child,
                                                gint             position);
index a52db32589613abac0680dc5c03690b62a7033a4..673c5b69d6d4b778461fa0a519d35e6aa416f4cf 100644 (file)
@@ -105,6 +105,13 @@ void    gtk_paned_compute_position (GtkPaned  *paned,
                                    gint       allocation,
                                    gint       child1_req,
                                    gint       child2_req);
+
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_paned_gutter_size(p,s)              (void) 0
+#define        gtk_paned_set_gutter_size(p,s)          (void) 0
+#define        gtk_paned_handle_size                   gtk_paned_set_handle_size
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index b454d2051cc89a3b6f159d66f8872cf1177675ea..eaed57f151e18e433873b5c5a9959a0d76575815 100644 (file)
@@ -47,7 +47,7 @@
 #include <glib.h>
 #include "gdkconfig.h"
 
-#include "gtkcompat.h"
+#include "gtkversion.h"
 #include "gtkrc.h"
 #include "gtkbindings.h"
 #include "gtkthemes.h"
index bfb099ef1ba12165dafc71cf1fa3ef8fddb170a9..b6a8e212cc80e27bc8be182e3992bd0cba0f406c 100644 (file)
@@ -86,6 +86,10 @@ void    _gtk_scale_get_value_size  (GtkScale        *scale,
 gchar  *_gtk_scale_format_value   (GtkScale        *scale,
                                    gdouble          value);
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_scale_value_width                   gtk_scale_get_value_width
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 291dfdc3921c69e3f6c10478dabfac98517f7193..4335e0bb874fcc7b16338aa53f5ce4918acb91ea 100644 (file)
@@ -841,6 +841,7 @@ const GValue* _gtk_style_peek_property_value (GtkStyle           *style,
 
 /* depprecated */
 #ifndef GTK_DISABLE_DEPRECATED
+#define gtk_style_apply_default_pixmap(s,gw,st,a,x,y,w,h) gtk_style_apply_default_background (s,gw,1,st,a,x,y,w,h)
 void gtk_draw_string     (GtkStyle        *style,
                          GdkWindow       *window,
                          GtkStateType     state_type,
index c9f8226ada771653bfba1c843d2959ed77f5d7d5..abc4e6f1fcd6eea16a8333a828c5c584cb9c9a9c 100644 (file)
@@ -84,6 +84,10 @@ void       gtk_toggle_button_set_inconsistent  (GtkToggleButton *toggle_button,
 gboolean   gtk_toggle_button_get_inconsistent  (GtkToggleButton *toggle_button);
 
 
+#ifndef GTK_DISABLE_DEPRECATED
+#define        gtk_toggle_button_set_state             gtk_toggle_button_set_active
+#endif /* GTK_DISABLE_DEPRECATED */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 3f13ab9d4601c8c7af2973bb5bf977c4daaff565..4eed3dbac4bbd59938dc9774d702b428a6a1d1d4 100644 (file)
@@ -72,10 +72,10 @@ typedef enum        /*< skip >*/
 /* outdated macros that really shouldn't e used anymore,
  * use the GLib type system instead
  */
-#ifndef        GTK_DISABLE_COMPAT_H
+#ifndef GTK_DISABLE_DEPRECATED
 #define        GTK_TYPE_FUNDAMENTAL_LAST        (G_TYPE_LAST_RESERVED_FUNDAMENTAL - 1)
 #define        GTK_TYPE_FUNDAMENTAL_MAX         (G_TYPE_FUNDAMENTAL_MAX)
-#endif /* GTK_DISABLE_COMPAT_H */
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* glib macro wrappers (compatibility) */
 #define GTK_STRUCT_OFFSET      G_STRUCT_OFFSET
index 7753d02dd61822990a0cd6779e79140ac1c3856e..457fbdb5141456bdfa954ed5c7d0cf9722435cea 100644 (file)
@@ -250,7 +250,8 @@ void       gtk_window_set_policy               (GtkWindow           *window,
                                                gint                 allow_shrink,
                                                gint                 allow_grow,
                                                gint                 auto_shrink);
-#endif
+#define        gtk_window_position                     gtk_window_set_position
+#endif /* GTK_DISABLE_DEPRECATED */
 
 /* Set initial default size of the window (does not constrain user
  * resize operations)
index 85891a00debed42e88c320b96ac8ef42b94fe734..6501bee21dd7b3eabc2b5e2524c2f83b7b64f8c6 100644 (file)
@@ -34,7 +34,7 @@ AWK = awk
 
 INCLUDES = -I . -I .. -I ../gdk -I ../gdk-pixbuf
 DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS)
-DEFINES = -DGTK_DISABLE_COMPAT_H -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
+DEFINES = -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" -DGTK_VERSION=\"@GTK_VERSION@\"
 
 GLIB_GENMARSHAL = $(GLIB)/gobject/glib-genmarshal.exe
 
index cec02d5c459128546eca61d23886990704cc4cc4..80c451ec1e64aee195b688ec92454c38f8570c67 100644 (file)
@@ -29,7 +29,7 @@ DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(A
 LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
 # Some files use near as an identifier
 # Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
-DEFINES = -DG_ENABLE_DEBUG -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
+DEFINES = -DG_ENABLE_DEBUG -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear -DGTK_VERSION=\"$(GTK_VER)\"
 
 TOUCH = copy makefile.msc+nul
 
@@ -341,7 +341,7 @@ gtk_public_h_sources =              \
 
 # these aren't use here, but listed for reference
 gtk_extra_sources = \
-       gtkcompat.h             \
+       gtkversion.h            \
        maketypes.awk           \
        makeenums.h             \
        gtk-boxed.defs          \
index e5c31b495014d458be60763b4a885095b6adae3a..06e3be983d55f398e8b486ddd1ceee632546e6c3 100644 (file)
@@ -4,7 +4,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gdk                             \
        -I$(top_builddir)/gdk                           \
-       -DGTK_DISABLE_COMPAT_H                          \
        -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
index 47ac8b80964de2cac713522ca819e94b1329c476..bf71bb654ab764502ef08c9e87460883c5e23c0b 100644 (file)
@@ -4,7 +4,6 @@ INCLUDES = @STRIP_BEGIN@ \
        -I$(top_srcdir)                                 \
        -I$(top_builddir)/gdk                           \
        -I$(top_srcdir)/gdk                             \
-       -DGTK_DISABLE_COMPAT_H                          \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_DEP_CFLAGS@                                \
 @STRIP_END@